Small fixes and improvements#3

Open

Zuquim wants to merge 2 commits into

RonanFelipe:masterfrom

Commits on Mar 2, 2018

Small update
Tulio
committed

Commits on Mar 6, 2018

Small improvements
Tulio
committed