Added public mode beta
merged