Improve performance and add counts
Commit d84da pushed by Anže Pečar

15 tests 15 passed Duration