Tomdoc

Merge of #41