Added latest version from etherpad
Merge pull request #181 from dajbelshaw/patch-4

Added latest version from etherpad