Merge pull request #41 from janm399/master

Formatting