updating the fork file to comment on github
merging in changes from upstream