Dev 1.1 Second Pull Request

@jesanjose done po sir! :bow: thank you po!