merged David's changes
Merge branch 'DavidMercier-master'