Merge remote-tracking branch 'origin/master' into gh-pages
Merge pull request #10 from garemoko/gh-pages

verbs which were already in master to go into gh-pages