Update README and user stories
"Merge branch 'master' into gh-pages"