Performance improved.
Conflicts:
	src/core/d2o_main_class.h
Travis CI compile error fix.