refactor
Merge branch 'master' of github.com:press0/diff

ok