Issue Resolved #296