payload and timestamp tweaks
Merge pull request #119 from TheDistractor/0.9.x

payload and timestamp tweaks