Attempted fix for issue #190
Merge pull request #191 from josh-/master

Attempted fix for issue #190