Merge branch 'master' into issue40

Conflicts:
	co/dataOStream.h