Correct time parse result
Merge remote-tracking branch 'pattichen/master'
Rebuild