Addressed Issues #185,#186 Fixed Issue #164