Some timing stuff.
Merges.
Merge branch 'master' of https://github.com/axeltidemann/self_dot

Necessary merge.