Merge pull request #1 from jackbentley/master

Initial Commit
Fixes compile config errors