update Jupiter and author name
new merge