fix
Merge branch 'master' of github.com:vinjn/glPlay