Some improvements

Support for timestamps
Support for multiple opened files