readme
merged
fixes