Merge pull request #1 from CAEP-UnB/master

Merging differences from forked repos
Merge pull request #2 from gestorpsi/master

Merging official commits
Merge pull request #3 from carloshfoliveira/master

Merging into devel
Merge pull request #4 from carloshfoliveira/devel

Devel