Performance test added
Merge branch 'master' into alberto-cpp