Pull Request Dev_1.0

done po 

![](https://assets-cdn.github.com/images/icons/emoji/bow.png)