Added merge_mappings option - closes #100