Comment fix
Merge branch 'beta'