ALCHEMY-12 #COMMENT  token modification
Merge pull request #1 from lamofred/fix_crazy_shit

ALCHEMY-12 #COMMENT  token modification