Merge pull request #13 from gordon-/master

Fixed comments from pull request #11
Fix issue with headers in error handler