fixed problem with nperiods and nturns in tracking
Merge remote-tracking branch 'origin/master'