Merge branch 'release/0.2.4'
Merge branch 'release/0.2.5'
revert time changes
Merge branch 'master' into feature/formater_time