Some fixes for Issue #10
Some fixes for Issue #10
Fixes #22
Some fixes for Issue #10