merging
Merge branch 'master' of github.com:rsdoiel/ws into gh-pages