Dev 1.0

I've applied the changes na po, thank you :bow: