hello changed to welcome
i merged upstream with the master