better handling
Merge branch 'master' of github.com:h4ck3rm1k3/pyxbot