Parameterize booleans
Merge branch 'parameterize_booleans'