Conflict merge error.
Merge pull request #50 from philsturgeon/conflict-fix

Conflict merge error.