not really sure
Merge branch 'master' of https://github.com/EduardoOliveira/TuxControl
refactoring