refactored
Merge branch 'matvei' of github.com:vildhet/octopus into matvei