Done on 7bbb4c9. Take a look at it and tell me if it's ok.