Merge branch 'master' into development
Merge branch 'master' into development
Run additional handlers on each request

Link to #18.
Merge branch 'feature-extra-handlers' into development
Merge branch 'development'