Merge pull request #47 from ProPercivalalb/master

Gimme updates!
Quick pre-release tweaks
Merge pull request #98 from chylex/master

Quick pre-release tweaks