Revert "Merge conflicts"

This reverts commit 43f68bb871b210a87962690dc374590e20156d67, reversing
changes made to 148128009fa5e3861fec36ca9515a8cca86353c9.
Merge pull request #20 from trevorriles/master

Revert "Merge conflicts"