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

This reverts commit c0c5c0970e0abf33e921bb86cf9ca956e425ca78, reversing
changes made to 0d0d76eb0ff47c67bfc1f9f05bbe2228f684d438.
Revert "Revert "Merge pull request #1 from jproextensions/master""

This reverts commit e8fddeb0d2cc5c7d9a2f326ac0dc34edb02aa729.