Resolves #7 - Fix Responses