fix bug: getTime return null
Merge branch 'dev'