Merge tag '0.2.1' into develop

Released 0.2.1 0.2.1
added unmap method to GenericMapper
bumped version
Merge branch 'release/0.2.2'