Mumudvb2

Hi Brice,
I've merged the recent commits and fixed couple of issues in the process.