Add some references to the code.
Merge branch 'MangoEstaban'