Dev 0.3 official merge 

Tv, etc..