merge with mapping, closes #152