Merge pull request #19 from TheBlueMatt/2018-04-error-handling-framework