Error Handler initializer, experimenting with controller patterns
Merge branch 'master' into gh-pages