Merge branch 'matthieu/example_monkey'