As requested, a pull request

Here are the changes I posted in the coursera forum, plus another that I found, and one that fixes a CMakeList.txt problem that I thought I had checked in (that's what i get for writing code and watching the Super Bowl)