Dev 1.0 First Pull Request

@jesanjose :bow: thank you po.. done po..