Pull request to master

Since this is related to the next post, I opted to just combine my answer there.