Improved attribute parser to handle values with equal signs

Improved attribute parser to handle values with equal signs #1464