I'm sorry, I probably miss something...

I'll do another pull request with my suggestion and you'll tell me what doesn't work, ok ? :)