Merge pull request #3 from gestorpsi/master

Pull
Merge pull request #4 from carloshfoliveira/devel

Devel
Merge branch 'devel'