Revert "Merge pull request #1 from jsparkD/master"

This reverts commit 071f73e45d84e462b7c12eff0cf654cc592a34f1, reversing
changes made to ad820976e1bdc18a72a1760a5cd7fcb027d4827b.
Revert "Revert "Merge pull request #1 from jsparkD/master""

This reverts commit f0290767d3971be0ec18d74f2263da2f6f424efd.