Formulas improvements pull request 16