Final formatting for round 1 (I think)
Merge pull request #27 from gr8pefish/patch-5

Final formatting for round 1 (I think)