Add a Wrap
Merge pull request #1289 from xbruce/develop

Add a Wrap