Merge pull request #3 from stevenvanrossem/patch-1