Move source/timestamp so it only occurs on leaf nodes
Merge pull request #26 from rob42/move-timestamp

Move source/timestamp so it only occurs on leaf nodes