itamarst Merge pull request #116 from itamarst/wrapt-issues-115 …