Merge pull request #12 from charlesrocket/htb