hacking session with tim #2
Merge pull request #2 from katja/hacking-session-2

Hacking session with tim #2