Error handling and bug fixes, fixed #5
Merge branch 'master' of https://github.com/jasuka/pyBot