Merge pull request #25 from belindahare/master

small bug fixes