Project configuration updates
Merge pull request #7 from matthewste/master

Project configuration updates