Pull Request Dev_1.0

Done. thanks po :+1: