added timestamps, closes #9