first attempt to fix 'stuck axis' bug
Merge remote-tracking branch 'origin/master'