Merge pull request #2 from schinckel/patch-2