SONATA-13 - Fix duplicated key/value

Linked to issue #8
SONATA-13 - Fix misplaced key/value

Linked to issue #8
Merge remote-tracking branch 'origin/master' into develop