code cleaning just for testing Git merge
Merge branch 'dev'