Fixed finally for Issue #12 and Issue #13