merged fix from diamondback branch

updated max_range