Some refactories
Merge branch 'master' of ssh://github.com/cesarwbr/qeeme