Issue 155: formatting update
Merge pull request #158 from logiclord/iss155

Issue 155: formatting update