Merge pull request #58 from xopherdeep/master

Merge pull request #30 from XenGenie/master
Merge pull request #31 from XenGenie/master

Merge pull request #58 from xopherdeep/master