refactored code
Merge branch 'master' of github.com:bakharzy/mini-mini-ohtu