fix to the strftime error
Merge branch 'test'