Use parse() instead of custom function
Merge branch 'GetTimeFixup'