updated a lot, will talk about it next HTH meeting
Merge branch 'master' of https://github.com/0x20/HTH