cosmetic fixes
Merge pull request #155 from dupon21/master

cosmetic fixes