Dirty fix for duplicate project issue, will refactor later. Fixes #120
Merge branch 'master' into builds
7.491