add time measurement
Merge branch 'master' into feature/orm