Merge branch 'master', remote-tracking branch 'origin'
add hour minute ...etc to changeTime event as well