Merge pull request #152 from aBothe/master

Small code cosmetics.