Handle missing when and offset parameters
Merge pull request #3 from dbieber/master

Handle missing when and offset parameters