Compile-ready version
Merge branch 'master' of https://github.com/triazo/music-and-sound-algorithm

Merging to fix issues with not being able to commit...