Merge branch 'atoum'