edit for workshop
Merge pull request #1 from lmjohnstone/master

pull req