Merge pull request #3 from jannopet/master

pull