Merge Beta 2 version into Master