Merge pull request #30 from XenGenie/master

Merge