Merge pull request #6 from Humbedooh/master

Merge upstream into infra repo