Merge changes from Vincentml

I would contact you directly Vincent, but there's no contact info..

Let me know if you'd like to get in touch!

Thanks,
Pavel