Merge pull request #1 from john29917958/john

John