Address wrapped primitives, fixes issue #5
Merge branch 'hotfix/0.6.2'