Commit Beta 1.0 - 2