Added modification of limit for restricted numbers
Merge origin/master