Merge pull request #11 from ProPercivalalb/master

Gimme updates!
Merge pull request #28 from chylex/master

Merge pull request #11 from ProPercivalalb/master