Refactoring (again) mine
Merge branch 'master' of github.com:Ezveus/Mine