Code refactor
Merge branch 'master' of https://github.com/Epsidon/DoctorOfBabel