Don't lose nformation about a function when using a decorator
Merge pull request #53 from cloudaice/devbranch

 Don't lose nformation about a function when using a decorator
Merge pull request #7 from fxsjy/master

merge master from fxsjy