Merge pull request #26 from Benczyk/master

Fluid_type selectors + some Lease formulas
Merge remote-tracking branch 'upstream/master'