Merge pull request #1 from Xanatosinc/master