First Dima's commit
And libraries
Merge branch 'origin/MyFix'