Merge pull request #5 from XenGenie/master

merge