Fix merge conflict
Merge pull request #12 from konklone/patch-1

Fix merge conflict