Merge pull request #3 from pkillian/WorkInProgress_m0.4

Spacing / Removed comments
Merge remote-tracking branch 'origin/master' into WorkInProgress_m0.4