cleaup
updated readme
merge fix