Updated with latests from ayende/master

Here it goes. Let me know how it goes.