Merge pull request #43 from AmyWhitney/feature

Merge pull request #42 from AmyWhitney/master