Merge pull request #9 from kerstin/master

Pull request from kay
Merge pull request #10 from kerstin/master

Aaand another pull request by kay