Fix Issue #149
Merge pull request #150 from bcbcarl/bugfix-149

Fix Issue #149