merge master into tidy-up branch

CHANGELOG.md

@@ -0,0 +1,8 @@
+# Change Log
+
+This project adheres to [Semantic Versioning](http://semver.org/).  
+Every release, along with the migration instructions (where necessary),
+is documented on the Github [Releases](https://github.com/dwyl/hapi-auth-jwt2/releases) page.
+
+If anything is unclear in the project documentation, please
+raise an issue: https://github.com/dwyl/hapi-auth-jwt2/issues (_we are here to help!_)

lib/index.js

@@ -23,6 +23,7 @@ internals.implementation = function (server, options) {
   assert(options, 'options are required for jwt auth scheme'); // pre-auth checks
   assert(options.validateFunc || options.verifyFunc,  'validateFunc OR verifyFunc function is required!')
 
+  // allow custom error raising or default to Boom if no errorFunc is defined
   var raiseError = function(errorType, message, scheme, attributes) {
     if (options.errorFunc && internals.isFunction(options.errorFunc)) {
       var errorContext = {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hapi-auth-jwt2",
-  "version": "7.0.2",
+  "version": "7.1.0",
   "description": "Hapi.js Authentication Plugin/Scheme using JSON Web Tokens (JWT)",
   "main": "lib/index.js",
   "repository": {