Formulas improvements pull request 18