Improve performance even more
Commit e1928 pushed by Anže Pečar

15 tests 15 passed Duration