last corrections
Merge branch 'development'