Properly resolve merge conflict
Merge pull request #4 from dannye/master

Properly resolve merge conflict