Merge branch 'develop' into 'master'

try to fix formatting for timestamp

See merge request !4