stronger out-of-bounds fix
Merge branch 'master' of https://github.com/samliu/moongoons