Fix what looks like a merge error
Merge pull request #3 from mikker/patch-1

Fix what looks like a merge error