Pull request for: #833

also modified a nose test to check that this works