Merge pull request #7 from Insoleet/master

Transfer wrapper bug fixes