Fixes to timestamp issue.
Merge pull request #5 from chads2000/SecurityToken

Fixes to timestamp issue.