Fix build script
Merge branch 'develop'