merge
final fix to SyntaxUserData
Merge pull request #1136 from diegosarmentero/master

final fix to SyntaxUserData