Merge pull request #4 from stephenc/watch-me-code

Watch me code changes completed