Streamline build script a bit
Streamline build script a bit more
Merge branch 'dev' into ms