hacking session with tim #1
Merge pull request #1 from katja/master

Hacking session #1