Improved Content-Description support and fixed crash (Fixed #350)