Merge pull request #67 from Bowman74/master

Fix compile errors.
Merge pull request #20 from Magenic/master

Merge pull request #67 from Bowman74/master