Corrected path to xi.ico
Merge remote-tracking branch 'origin/master'