Merge pull request #125 from haraldschilly/master

CH3: 4 minor changes