updating back integrate for new api
fixed merge conflict
Merge branch 'master' of github.com:adrn/streams
copy parameter dictionary before removing r_0
n=10000 memory error