This closes #7
This closes #9, also closes #5
This closes #11
Desenvolvimento da issue #6
Resolvendo conflitos locais