This addresses issues-197. Thanks to lafwood for debugging this for me.
Merge pull request #198 from toyowheelin/issue-197

This addresses issues-197. Thanks to lafwood for debugging this for me.