merge

@author: GMartigny