Make file matching easy
Skip the outermost cells
The integration is still accurate for a larger step cap
Further speed up the code by using larger step cap
Merge branch 'develop' into master