WIP
Merge commit '10b57f32828ef6a27b0beeafa98b2db3dcfb9b34' into development

Conflicts:
	source/Cor.cs
Fixing work in progress issues.