I used Microsoft Image Composite Editor recently and it worked pretty well!
It's free and easy to use.