Merge pull request #1 from BestGamer/master

Pull changes from master