Merge pull request #52 from ProPercivalalb/master

Gimme updates!
Updates and stuff...
Merge pull request #111 from chylex/master

Updates and stuff...