add changes for 2.1.4
Merge pull request #11 from bjornstar/feature/moreErrorContext

add changes for 2.1.4