Merge pull request #16 from xopherdeep/master

Merged
Merge pull request #17 from xopherdeep/master

updated ignore
Merge pull request #23 from XenGenie/master

Nightly