Tweaks to wrapping/unwrapping for Beta6->GM
Merge pull request #1 from cocoacoderorg/master

Tweaks to wrapping/unwrapping for Beta6->GM