Merge pull request #1 from mickkellogg/master

Friday (update)