Merge branch...

Merge branch '90-add-a-performance-test-to-be-able-to-compare-directly-to-the-java-code-2' into 'python-rewrite-of-java-code'

Resolve "Add a performance test to be able to compare directly to the Java code"

See merge request !109