Merge pull request #269 from mikera/develop

Project configuration updates