Bug fix

check for empty strings before parsing time values
Merge branch 'release/9'