Merge branch 'dev'
new build
added tempo controls
Merge branch 'master' into dev