Fixes and updates to the attributes parser (#117)
Conform to C++98 standard
Merge branch 'attributes-fixes'

Conflicts:
	ChangeLog