Removing performance-measurements
Merge branch 'devel'
Merge branch 'devel'
attempt to verify #79