Merge pull request #135 from xavismeh/develop

SONATA-265 - Architecture documentation enhancement
SONATA-265 - Improved code comment
Merge remote-tracking branch 'upstream/develop' into develop