manuelreif Merge pull request #1 from nachti/patch-1