newest build tools
Merge branch 'master' into develop
fixed the setup