BUG/ENH: Add Tim and Margaret

Fixes #100