Merge pull request #67 from Bowman74/master

Fix compile errors.