ticket:68 Merge branch 'master' into production
ticket:68 Fixed tests
ticket:68 Merge branch 'production'