Few fixes to get it working with Grape & RestClient

Hi,

I had to do a few modifications to get everything working with Grape and RestClient.

Maybe you will be interested in merging these. 
Feel free to tell me if you don't, so that I keep this on my fork.

Thanks a lot!
Nico