Address feedback from #189 and fix #191.

Closes #191.
Merge pull request #192 from Ryman/189_fixes

Address feedback from #189 and fix #191.