Merge pull request #45 from Gonthim/master

Refactoring to fix build problems.
Fixing dependency issues. Reverting version to re-release.