Use COUNT(*) / code style

Signed-off-by: Etienne CHAMPETIER <etienne.champetier@fiducial.net>
Merge pull request #305 from echampet/master

Use COUNT(*) / code style