Adds changes introduced by #17 and #9
Merge branch 'master' of github.com:blongden/vnd.error