added lines
Merge branch 'BETA'