breaks
Merge branch 'dev'

Conflicts:
	R/wrightMap.default.R