Fix Issue #9
Fix Issue #12
Fix Issue #21