Final 1.0

Final update