Merge branch 'picture' into pretty