Merge new-features
Merge branch 'new-features'
Issue #19
Merge branch 'master' into bugfix
Issue #25
Issue #25
Merge branch 'bugfix'
Merge new-features
Merge master
Issue #33
Issues #36 (final) e #4 (parcial)
Issues #26 e #4 - Implementação final
Merge bugfix
Merge bugfix
Pequenas otimizações
Issue #37
Issue #24
Issue #39