Merge pull request #29 from comperiosearch/dev_htb

Bugfixes