Fix error in assert statement about dk <= stepk
Merge branch 'master' into #389