Adds Ludivine
Fixed compatibility issues with ludivine
Merge branch 'tapir'