Fix Issue #6
Fix Issue #7