Updated 1.0 Branch