Supply error codes (Fixes #11)
Merge branch 'master' into gh-pages