Decoupling more the code
Merge branch 'master' of github.com:krolow/ConsolePlus