closes #66. Please see etherpad doc for comments