added logo
merged latest