Better parsing
Merge branch 'master' of ssh://github.com/Detegr/HBot