get ride of hardcoded token parsing
Merge pull request #28 from imlucas/fix-hard-coded-timestamp-bugs

get ride of hardcoded token parsing