added javadoc link to RFC 2231
fixed broken unittest
added TODO mark