Merge pull request #7 from gaaf/patch-1