Pull Request Dev_1.0

Fixed it po :+1: