Merge tests and add a couple more
Add some documentation and notes about timestamp
Release v0.37