Merge pull request #2 from BestGamer/master

Pull changes from master