Pull request from @souvik1982

Added working track fitting from @souvik1982