Phil's updates
Merge pull request #1 from philpartain/master

Phil's updates