Added an update link for #240
Merge remote-tracking branch 'origin/master'