merged repository and improvement in om-welcome