bluhm Merge pull request #4 from moritzbuhl/patch-1