ENH: Add "when" parameter
STY: Docstring
Merge pull request #165 from Eric89GXL/when

ENH: Add "when" parameter.  :+1: