Merge branch 'issue-4' into 'develop-v2.1.1'

Updated to new time-related properties

Closes #4

See merge request !7