Updated build shiedls to be less ugly
Merge branch 'develop'