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

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

Conflicts:
	R/approx_Z_R.R