Merge branch 'pr/215' to close #215

This takes wking's refactoring, rebased onto master, and fixed
so that it so that it behaves at least as well as before (as far as I can tell).
This really needs some unit tests!

Thanks for the clean-up, Trevor!

Closes #215

Author: rwest