Merge pull request #1 from joaocgreis/master

merging with master