First pass at #96
Merge pull request #913 from mariehuynh/patch-1

First pass at #96