Merge pull request #50 from gordon/master

coding style