Fixes Issue #141
Merge pull request #147 from shirerom/develop

Fixes Issue #141