bug in time span of analysis
Merge remote-tracking branch 'upstream/master'