Merge pull request #236 from rjynn/newBranch

fixed style to make it more readable
Merge remote-tracking branch 'upstream/master' into newBranch