Fixes merge conflicts (hopefully).
Fixes merge conflicts (hopefully).
Fixes merge conflicts (hopefully).
Merge pull request #17 from ryansmith94/patch-1

Fixes merge conflicts (hopefully).