Pull Request Dev_1.0

Done po :+1:  thanks po for noticing