#51 Исправлено.
Merge branch 'master' into artem