Yep. And they are already switching it up from the pilot slightly to align better with the comics. However expect many not quite cigarette gags and as a disappointment for some, no mention about his bisexual nature.
io9 has been covering this for quite a while now.