fixed bugs
Merge branch 'development'