file for pull-testing
Merge pull request #1 from kerstin/master

Pull request from kay