fix bug
Merge branch 'dev' of github.com:victorgong/intime into dev