improve the organization of the dan class
Merge branch 'development' into chris_development

Conflicts:
	dan