Merge pull request #35 from scarabeusiv/master