Merge pull request #673 from mndrix/less-time-data