Merge branches 'mal4s' and 'master' into mal4s
Updated formula.