merge Laurent's additions into arch
Merge branch 'master' of github.com:scattlab/scattlab