Merge branch 'master' of https://github.com/antiphon/rstrauss

Conflicts:
	NAMESPACE
	R/approx_Z_path.R
Tweeks.
Update branch.

Merge branch 'master' of https://github.com/antiphon/rstrauss

Conflicts:
	NAMESPACE
	R/approx_Z_path.R