Revert PR#2 because it broke master.
Merge pull request #19 from bdpayne/revert1

Revert PR#2 because it broke master.