separate hours with newline chars
Merge branch 'master' into test