Finer control over how the attributes are set
Merge branch 'cycle'

Conflicts:
	docs/noddy.cxx