Cosmetics
Coding style: extract function for 80 columns
Merge branch 'master' of https://github.com/thierry-martinez/2014-11-mds