Pull Request Dev_1.0

Done po :+1:  thanks, this is a big help 

![](https://assets-cdn.github.com/images/icons/emoji/bow.png)