Fix formatting
Merge pull request #18 from dlobo/FormattingFixes

Fix formatting