optomization
Merge branch 'developement'