Optimize wrap
Merge pull request #231 from arv/micro-optimize-wrap

Micro optimize wrap