issue #12 fixed: Now we check if a mapping already exists before creating a new one
Merge branch 'issue#12' into develop