Fixes Issue #156
Merge pull request #157 from wesrice/master

Fixes Issue #156