Made some changes after reading comments on #45

(that pull request addressed this issue as well)