1 files changed, 34 insertions, 4 deletions

diff --git a/unitsfile.txt b/unitsfile.txt
index 78e51f7..bda9b81 100755
--- a/unitsfile.txt
+++ b/unitsfile.txt
@@ -55,6 +55,7 @@ atto-					1e-18
 zepto-					1e-21
 yocto-					1e-24
 
+da-						deca
 D-						deca
 h-						hecto
 H-						hecto
@@ -123,6 +124,9 @@ T						tesla
 hertz					s^-1
 Hz						hertz
 
+gram					millikg
+g						gram
+
 # Angle units and constants
 
 # Tau is the circle constant, equal to a circle's diameter divided by its radius
@@ -134,9 +138,9 @@ radian					m / m
 rad						radian
 steradian				m^2 / m^2
 sr						steradian
-degree					360 / tau * radian
+degree					tau / 360 radian
 deg						degree
-°						degree
+°						degree
 
 # Nonlinear units, which are not supported by the file reader and must be defined manually
 # Use tempC(100) for 100 degrees Celsius
@@ -171,7 +175,7 @@ arcsecond				1 / 60 arcminute
 arcsec					arcsecond
 
 # constants
-waterdensity			1 kilogram / litre
+waterdensity			kilogram / litre
 
 # Imperial length units
 foot					0.3048 m
@@ -183,6 +187,10 @@ yd						yard
 mile					1760 yard
 mi						mile
 
+# Compressed notation
+kph						km / hour
+mph						mile / hour
+
 # Imperial weight units
 pound					0.45359237 kg
 lb						pound
@@ -231,4 +239,26 @@ metricpint				2 metriccup
 pint					metricpint
 metricquart				2 metricpint
 quart					metricquart
-metricgallon			4 metricquart
\ No newline at end of file
+metricgallon			4 metricquart
+
+# Energy units
+calorie					4.18 J
+cal						calorie
+Calorie					kilocalorie
+Cal						Calorie
+Wh						W h
+
+# Extra units to only include in the dimension-based converter
+km						km
+cm						cm
+mm						mm
+mg						mg
+mL						mL
+ml						ml
+kJ						kJ
+MJ						MJ
+kWh						kWh
+m/s						m / s
+km/h					km / h
+ft/s					foot / s
+mi/h					mile / hour
\ No newline at end of file