Merge pull request #1 from getschomp/master

Pull
Merge pull request #2 from getschomp/Pat's-Branch

Merge pull request #1 from getschomp/master