time changed from nanoSec to sec
Merge branch 'dev'