Merge pull request #7 from Humbedooh/master

Merge upstream 0.7.3 into local master