Merging pull request with changes we made at meeting 10/19