Merge pull request #14 from huntwelch/brain_surgery

Brain surgery
fixes
brain surgerierieiiee'
Merge pull request #84 from elliottcarlson/brain_surgery

Brain surgery