Pull Request Dev_1.0

done and used this to other conditions wherein I used empty() :+1: