readme
merged in master
wip