fixes from stephanies email
Merge pull request #1 from jeremiak/master

fixes from stephanies email