Fix Issue #54
Fix Issue #53
Fix Issue #48