add timestamp
add wait in element put
Merge branch 'master' into yhidaka