Added missing link
Fixed commit conflict
Fixed note about encoding issue