Import clean version of my code
Merge branch 'master' of github.com:trigonak/ccbench