Revert "Revert "Merge pull request #2 from kieckhafer/patch-2""

This reverts commit 46b8ee79f50bfde7182190497dc8a4c1b2f9bded.