merge diogojapiassu-master into pr45