Merge pull request #2 from xopherdeep/master

Merge pull request #8 from XenGenie/master
Merge pull request #9 from XenGenie/master

Merge pull request #2 from xopherdeep/master