V2012
Merge
Merge branch 'refacto'
Merge