new info
merged changes from github