used epoch for timestamp
Merge branch 'master' of https://github.com/danielglennross/TrackingHack