Formulas improvements pull request 19