Fix empty link issue
Fix to install issue
Merge remote-tracking branch 'origin'