Pull Request Dev_1.0

Done :+1: