Fixes
Merge branch 'master' of github.com:CaffeinaLab/SiriWaveJS into HEAD