Merge pull request #3 from jannopet/master

pull
Merge pull request #4 from jannopet/janno-development

Merge pull request #3 from jannopet/master