Formulas improvements pull request 13