Bug fixes
Merge branch 'master' of https://github.com/wmm-olin-scope/stories.edu