Merge pull request #29 from EifX/master

Time conversion problem