Fixed minor typos.
Merge branch 'solutions'