dmpham "Add testes to improve code coverage"
dmpham "merge with dev"
dmpham resolve conflics