Cleanup of & in field names and some boolean/numeric comparisons in
condition text
Merge pull request #6 from abies/develop

Cleanup of & in field names and some boolean/numeric comparisons in condition text