Refactor
Merge branch 'master' of https://github.com/supersuporte/java-dev