Merge timestamp branch to master