Merge pull request #55 from pkkup/master

refactored/improved wrap_data