updates
Merge branch 'dev' of https://github.com/peachproductions/unitsofsound into dev