merge

Merge branch 'dev' of https://github.com/kkmann/cme into dev

Conflicts:
	R/sim.R
Merge branch 'dev' of https://github.com/kkmann/cme into dev