Merge pull request #318 from Pomax/bug939133

tightened up the attribute parsing rules
restructured parsing to catch invalid attribute names