Merge pull request #27 from XenGenie/master

Merge
Merge pull request #28 from xopherdeep/master

Update
Merge pull request #29 from xopherdeep/nightly

Merge pull request #28 from xopherdeep/master
Merge pull request #36 from xopherdeep/master

Merge