Merge timestamp branch

Issue #1