Improved rfc 2616 compliance