Dev 1.0 First Pull Request

mam @angge-deborja :bow: thank you very much po.. now defined po..