improved build scripts
Merge branch 'code-quality' into develop