Pull Request 2 Dev 1.1

It worked po, this is a very big help. Thanks po :bow: