Merge pull request #162 from gvwilson/master

Master
Merge branch 'master' into new-shell-beginner-lessons