Cosmetic fixes
Merge pull request #34 from vosen/master

Cosmetic fixes