Can you merge this in to master pls

All the changes including new logo etc