Merge pull request #17 from jryberg/master

More changes to fix html vs Markdown syntax issues