Merge branch 'master' of https://github.com/OSSIA/OSSIA and fix bug
Merge branch 'master' of https://github.com/OSSIA/OSSIA