added s to window_mean function
Merge remote-tracking branch 'upstream/master'