Merge branch 'master' of github.com:bonyiii/jsaudio