upgraded and corrected attributes tokenizer and parser
Merge pull request #36 from alg/attributes-tokenization

Upgraded and corrected attributes tokenizer and parser