Fix some bugs with html escaping
pod -> md
minil files
Merge remote-tracking branch 'upstream/master'