Merge remote-tracking branch 'nsz/math'