Resolves merge conflict
Merge pull request #8 from cuppajiu/hannahbranch

Resolves merge conflict