fixes #297
Merge branch 'integer-types-timespan'