Coming back to work ... i'll clean and update this pull request soon.