Merge pull request #1 from karlhorky/master

fix ordered lists
Fixed html markup
merge conflict from upstream