Merge pull request #30 from ddavidov/develop

tooltipText
Checktoken modified