Issue 159 - fix status codes