1988 Jeep Wrangler Sputter and hesitation

Hey guys,

My '88 Jeep Wrangler YJ has idling problems. It struggles when you stop at a red light or when you first start it up. It's like it wants to stall, and sometimes it does. It doesn't do it all the time though, but it does it often enough for me to not want to drive it.

Also, mostly when I'm driving through the city, I'll step on the gas to accellerate and it will hesitate and sputter before it gets going. I'll have to pop it into neutral and hit the gas to get the rpm's up.

I'm assuming the 2 problems are related, but I don't know for sure. Any ideas or advice would be greatly appreciated.