Merge pull request #5 from SuperDomX/master

Merge
Merge pull request #6 from SuperDomX/nightly

Merge pull request #5 from SuperDomX/master