Alexey's refactoring after first iteraton
logs for production
Merge branch 'develop'