Using application based timestamps

Also:
- Use function for timestamp conversion
- Fixed typo
Merge pull request #1 from andrechrist/master

Application Based Timestamps