Merge pull request #1 from thundercat1/master

Pull1