Merge branch 'development'
[UPDATE] structural changes
Merge branch 'development'
Merge branch 'master' into development