Merge pull request #3 from paufsc/master

pull3