Added all_terms = true. closes #541