Merge pull request #1 from niclupien/master

touchup for presentation
update
Merge pull request #1 from gspfranc/master

Update