Merge branch 'solved'