BUG/ENH: Add Tim and Margaret

Fixes #100
Add @squirrelo
Merge pull request #112 from ElDeveloper/issue-100

BUG/ENH: Add Tim and Margaret