Problem: PR #31 clobbered PR #30
Solution: Restore changes from PR #30
Merge pull request #34 from jemc/master

Problem: PR #31 clobbered PR #30