merge with datespan-default
use keywords args
Merge branch 's-hist' into staging2