Made some changes after reading comments on #41

(that pull request addressed this issue as well)