axis fixed
Merge branch 'axis'