Merge pull request #309 from sbesson/rebased/develop/walkthrough_fixes

Walkthrough fixes (rebased onto develop)