Merge branch 'release/0.3.5' into develop
fix timestamp bug
v 0.3.6
Merge branch 'release/0.3.6'