Update docs #37
Update helpers
Update helpers
Merge pull request #38 from matthew-andrews/update-docs

Update docs
Merge remote-tracking branch 'upstream/master' into overrides-should-override