Develop2

Hi,

My "count" pull request is too big (and i'm currently rebasing it on top of develop)
Please merge this one first, ask me as many questions as you like

Regards
Etienne