Stalling problems with a 1996 Jeep Grand Cherokee Laredo 4x4?

My jeep keeps stalling on me... Usually after iv been driving for about 15 mins and the engine is in idle. Sometimes it just cuts off and sometimes it'll idle kinda rough. when it idles rough you can hit the gas and nothing will happen at first but you just have to keep hitting it and it'll come back. After it stalls it starts right back up. Recently iv replaced cad converter, o2 sensors, and cleaned throttle body and motor. Any one have any suggestions?