Work on structured comments
Merge pull request #35 from jetty840/dnewman-merge

Work on structured comments