First commit Kaff
Better timing
Better timing - test
Better timing
V 1.0
Merge branch 'master' into kaff