Feature/clientid

also fixes https://github.com/ethereum/go-ethereum/issues/97