last cosmetic changes
Merge pull request #438 from ffrensch/master

last cosmetic changes