Merge branch 'release/1.0' into develop
time measurement added
Merge branch 'release/v1.1'