Handle combination of with and from options + decorator defined method.
Merge pull request #2 from robincurry/bug/with_from

Handle combination of with and from options + decorator defined method.