Removed bug that limited radius to 2 digit in autoload function
Merge branch 'master' into YKA