Gallons to liters
Merge origin/master