Merge remote-tracking branch 'eroux/add-base'