Fix Time encoding
Update specs for both cases, fix c ext
Merge branch 'pr/16'