Merge pull request #601 from mgballard/master

Style issues post 1.0