Issue 430 content negotiation

See #430.