Set up project for building
Merge branch 'release-1.0'