This would close #140 (closed) in the way described in my comment
Closes #140 (closed)
/cc @kasbah @rwb27