Merge pull request #377 from joola/feature/#118

#118 mid-way re-base of benchmark
#125 cleanup merge
Merge branch 'develop' into feature/#118