Merge pull request #53 from ProPercivalalb/master

Gimme updates!
Things and stuff. Random names.
Merge pull request #112 from chylex/master

Things and stuff. Random names.