Commit to sync fork with master

Sync the fork setop estagio with the master of tecbus/taxi.