Johannes can you merge 2.0 to master? There's a conflict in cdparanoialib that is not trivial, maybe you can ask Mark about it? Cheers, Albert