bug fix
Tidy
Merge branch 'origin/Expendable'

Conflicts:
	R/Raster.R