Merge pull request #14 from brianmckenna/testbed

long Sunday...
did I mention long Sunday?