Optimises build folder
Merge branch 'v1.1'