information added from learngitcopy
commit after merge