Pull Request Dev_1.0

Done po 

![](https://assets-cdn.github.com/images/icons/emoji/unicode/1f647.png)