Merge branch 'development'
code cleaning