Forming dictionary
Forming dictionary
Merge branch 'develop' into iss5