sebh Merge pull request #2 from tederis/patch-1