Improvements in formatting
Merge pull request #41 from cloudsleuth/master

Improvements in formatting