commit 1401
Merge branch 'master' of https://github.com/Andreas-Keller/Soundplayer