Merge pull request #2 from stoewer/master

Basic project configuration