Re-applying #9 manually

Re-applying #9 manually due to merging into wrong branch
Updated build script to allow seperation of packaging from build
Merge branch 'origin/develop'
Merge branch 'origin/master'