Merge master
Issue #33
Issues #36 (final) e #4 (parcial)
Issues #26 e #4 - Implementação final
Merge bugfix
Merge bugfix