suggested refactoring
Merge pull request #1 from JonRowe/fix_wrap_args

Suggested refactoring