update links and merge master