Updated from last version of master

- Changes from subLogo issue is now on test