Improve non-padded strict tokens
Merge pull request #1418 from ichernev/bugfix/strict-parsing-non-padded-units

Improve non-padded strict tokens