Revert to working state
Merge pull request #39 from slkennedy/sara-master

Make it so