Fixes Issues #231
Merge pull request #239 from burnsjeremy/master

Fixes Issues #231