update-0617

almost done
Merge pull request #2 from gn01830657/long

update-0617