Merging development branch

Andre de Sousa Costa Filho requested to merge development into master Jan 21, 2020