Merge pull request #1 from Trebek/master

pulling from trebek