Merge branch 'master' of https://github.com/HenryYoung/WSD
Merge branch 'master' into gh-pages