Merge pull request #270 from tkruse/style_fixes