add documentation
add documentation
update test, because behavior different then expected
revert code, define behavior in documentation
Merge pull request #206 from dennishendriksen/master

Revert Mapper fix + update tests