Refactor for readbility and speed
Temp merge

Merge branch 'master' of https://github.com/baaqmd/CES-explorer

Conflicts:
	global.R