Pull Request Dev_1.0

fixed po :+1: