Fixed #170: Appending double-encoding bug

With thanks to Stephen Taylor for reporting
Updating headers to v25 (not actual release yet)