cleaning the code
Merge branch 'development'