Fixing bug with comment formatting.  Fixes #36
Improving block comment formatting. Fixes #37