Formatting fixes / more comments
Merge pull request #4 from tas50/master

Formatting fixes / more comments