this is broke upstream?
Merge pull request #20 from rackerjoe/work

Merged automatically by jenkins after successful build test