Fix project setup
Merge remote-tracking branch 'nicholas/master'