Cosmetic fixes
Merge pull request #166 from Pliner/master

Cosmetic fixes