Change build flag handling
Merge branch 'master' of github.com:curipha/scripts