Merge pull request #333 from katiewood/master

update readme
Merge pull request #334 from katiewood/master

update readme