Elaborated solution + corrected answers + added codices
Merge pull request #707 from abhinavc/master

Elaborated solution + added codices