and html needs some formatting
Merge pull request #18 from drozer/master

and html needs some formatting