Adds the ability to remove Tim.
Merge branch 'master' into gh-pages