plotter - timestamp support
container - merge (fixes #97)