Merge pull request #252 from fabienrohrer/master

Indentation and comments