maltes
committed
on 19 Jun 06
Added support for extraheaders. Cleaned up a bit