Added unwrap method and tests

Test passing.
Merge remote-tracking branch 'upstream/master'
Added tests, fixed unwrapper
Merge pull request #2 from Dazzla/master

Fixed unwrap method, added tests