fixed time conversion
Merge branch 'fix_time_conversion'