Merged the welcome-controller branch