Merge branch 'issue/#5' into develop

Conflicts:
example.json