Fixed issue #57 and the issue of a wrong variable causing a critical bug #58

Closed rituparnagithub closed 3 years ago