Merge pull request #347 from dlobo/FormattingFixes