FIx class name
Add error management
Update doc