Added time stamps.
Merge branch 'master' of https://github.com/feitelsonc/Amp