Formulas improvements pull request 17