Fixes issue #231
Merge pull request #232 from cyberjacob/master

Fixes issue #231