Installing Ceiling Fan with black and white wires

I removed a ceiling fixture that was hooked up to two white wires. The black wires were connected together with a marr cap. The ceiling fan I want to install asks for connections to be made to black and white wires. Do I connect the black wire from the ceiling fan to the two already connected together in the junction box, and do I connect the white wire to both the white wires that come from the junction box? The switch on the wall has a black and white wire coming from it.