Merge pull request #5 from SuperDomX/master

Merge