Dev 1.0 First Pull Request

@angge-deborja  :bow: thank you very much po for noticing ..^_^ done po.