Merge pull request #46 from Gonthim/master

Fixing dependency issues. Reverting version to re-release.