Formulas improvements pull request 14