Merge pull request #17 from ProPercivalalb/master

Gimme updates!
Random updates, fixes etc.
Merge pull request #39 from chylex/master

Random updates, fixes etc.