fixed timeseries constructor compile issues
Merge origin/master