re #722 - Updated logo and fixed some issues after merging with master