Updated and fixed to 2.0

Acepta franchu!