Bug Fixes
Merge branch 'master' of https://github.com/basdag/08707