Fixing timing
Mergint new timing constructs.

Merge branch 'master' of https://github.com/navoj/Alita