Merge branch 'two_axes'