First solution
Merge branch 'solution'
Updated README with branch information