Merge pull request #34 from XenGenie/nightly

Nightly
Merge pull request #35 from XenGenie/nightly2

Merge pull request #34 from XenGenie/nightly