feature #56
* Мелкие правки
Merge branch 'feature56'