fixed null poiter error time format
Merge branch '1.7' into issue#14