Merge pull request #19 from LPGhatguy/master

Fixes to Compile