alternate words for television?

I come across the word television as both 电视(diànshì) and 电视机(diànshìjī ) is there a difference in meaning between the two? Why is it used both ways ? Is it similar to saying t.v. and television in English? Is one better to use than the other?