MAKE IT STOP
Merge pull request #22 from ben-grid/makeItStop

This is MADNESS!