Merge pull request #3 from willianjusten/master

Update from original
Add more more things :)
Merge pull request #41 from jorgeatgu/master

Add more more things :)