arrange timestamps
Merge pull request #27 from just-boris/features

Arrange timestamps