Added logo
Merged changes