Merge pull request #3 from Humbedooh/master

Merge 0.6.3 from upstream