adding github fork merging

git fork merge of upstream files