merge test results
matlab algorithm is fixed. optimal parameters are found