bug fixed and changes
changes
Merge branch 'development'