F-24 : Random Sonar fixs
Merge pull request #30 from aprilangel/F-24-Fix1

F-24 : Random Sonar fixs