Revert "Merge with Master"
Merge pull request #41 from monicaedavidson/revert-37-master

Revert "Merge with Master"