merging for first  releas

I think