Merge pull request #249 from svost/time-const