update to fork

i have made the changes. pls check