Merge branch 'fix_for_axis' into 'master'

Fix for axis

See merge request !15
6 jobs for master in 4 minutes and 46 seconds (queued for 1 second)