Add @mgiraldo's work to demos