Adding Ivan's stuff, instead of Karthik's.
Merge branch 'gh-pages' of https://github.com/iglpdc/2014-01-13-uri into gh-pages