Fix 274

[pminervini]

Let me just check that all tests pass, and that the documentation is consistent with the code..