fix infinite loop (thanks to Kevin Chiu / KevinC1118, see Pull Request #3)
Merge branch 'master' into develop
Merge branch 'develop' into feature/mo_player