fix some problems
Merge branch 'master' of github.com:mahfel/bot