Merge pull request #44 from AmyWhitney/master

Merge pull request #43 from AmyWhitney/feature