Up to date merged Rspec2 compatibility. 

I've brought my master up to 1.04 and applied the rspec2 fixes. Any chance of bringing this into master?