algo mods
Merge remote-tracking branch 'kiwi/master'

* kiwi/master:
  adding timestamp