Merge pull request from numerical-mooc/master

Update from original