Changes from pull request
Merge branch 'master' of github.com:peterc/pismo