Merge pull request #34 from XenGenie/nightly

Nightly