Fix Time encoding
Merge pull request #16 from fbernier/master

Fix Time encoding