Dev

Closed Vitor Lopes requested to merge (removed):dev into master

Another code clean up, always test.

Merge request reports