follow rjs
Merge branch 'dev' of https://github.com/victorgong/intime into dev