Tweaked project setup
Merge branch 'dev'