Addressed issues posted by github users