Merge pull request #2 from tobiasschulz/master

merge