Issue #131 - fix status codes