fix bugs found
Merge pull request #50 from sarahgosago/v1.0.0/2056

fix bugs found