refactoring
Merge branch 'master' of github.com:makora9143/enotwi