1.8.7 compatibility

Hi,

I didn't manage too make a simple rebase.

So I prefered forking your master branch again and apply changes by hand ... (shame on me ;-))

I expect you'll find it as you expected.

Maneau