merge victortarelho-master into pr40