Use wraps decorator so we don't lose the identity of the decorated function
Merge pull request #278 from lucasmarshall/master

Use wraps decorator so we don't lose the identity of the decorated function