readme stuff
fix merge with readme