Refactoring (suite)
Merge branch 'master' of github.com:Villard-David/Souvenirs