Merge pull request #50 from timwindsor/master

Couple more extension points