Added multi digit support

Merge request reports