Merge pull request #3 from sfarfarini/master

comments a partial style refactor
Merge remote-tracking branch 'upstream/master'