Merge pull request #5 from XenGenie/master

merge
Merge pull request #6 from XenGenie/nightly

Merge pull request #5 from XenGenie/master