Fix images
Merge branch 'beta'