bug fixes
Merge branch 'master' of https://github.com/thdg/Tales-of-Binklebard
bug fixes