Merge pull request #363 from jpecht/master

cosmetic stylings