edit 1.0 Ready to merge.