(yoyo) code style :)
Merge pull request #83 from stephenplusplus/master

(yoyo) code style :)