From 3f1830c7bdd0e168679ef73993b459e3e981026f Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 14:14:14 +0200
Subject: [PATCH 01/27] New aliases and definitions

added common aliases and definitions of power
---
 scimath/units/power.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/scimath/units/power.py b/scimath/units/power.py
index 12de73a..2759662 100644
--- a/scimath/units/power.py
+++ b/scimath/units/power.py
@@ -12,17 +12,29 @@
 #
 
 from __future__ import absolute_import
-from .SI import watt, kilo
+from .SI import watt, kilo, mega, giga, tera, milli
 
 #
 # Definitions of common power units
 # Data taken from Appendix F of Halliday, Resnick, Walker, "Fundamentals of Physics",
 #     fourth edition, John Willey and Sons, 1993
 
+milliwatt = milli * watt
 kilowatt = kilo * watt
-kw = kilowatt
+megawatt = mega * watt
+gigawatt = giga * watt
+terawatt = tera * watt
 horsepower = 745.7 * watt
 
+# aliases
+
+mW = milliwatt
+W = watt
+kW = kilowatt
+MW = megawatt
+GW = gigawatt
+TW = terawatt
+
 
 # version
 __id__ = "$Id: power.py,v 1.1.1.1 2003/07/02 21:39:14 aivazis Exp $"

From 4a404feb3c086f9b7c8bfb6d16f287e246c0dc38 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 14:16:29 +0200
Subject: [PATCH 02/27] New alias

---
 scimath/units/area.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scimath/units/area.py b/scimath/units/area.py
index bd72a13..40cee82 100644
--- a/scimath/units/area.py
+++ b/scimath/units/area.py
@@ -35,6 +35,7 @@
 b = barn
 bn = barn
 barns = barn
+m2 = square_meter
 
 # version
 __id__ = "$Id: area.py,v 1.1.1.1 2003/07/02 21:39:14 aivazis Exp $"

From f8d26c5c95bba02f25624421d6d4cb6477711444 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 14:21:34 +0200
Subject: [PATCH 03/27] add kilovolt

---
 scimath/units/electromagnetism.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scimath/units/electromagnetism.py b/scimath/units/electromagnetism.py
index 2a2144e..1d394f3 100644
--- a/scimath/units/electromagnetism.py
+++ b/scimath/units/electromagnetism.py
@@ -2,7 +2,7 @@
 from copy import copy
 
 from scimath.units.SI import ampere, coulomb, farad, henry, joule, ohm, \
-    meter, micro, milli, pico, siemens, tesla, volt, watt, weber
+    meter, micro, milli, pico, siemens, tesla, volt, watt, weber, kilo
 
 ###############################################################################
 # electric current
@@ -23,14 +23,18 @@
 ###############################################################################
 
 volts = volt
-v = volt
+V = volt
 
 millivolt = milli * volt
 millivolt.label = 'mV'
 milli_volt = millivolt
-mv = millivolt
+mV = millivolt
 millivolts = millivolt
 
+kilovolt = kilo * volt
+kilovolt.label = 'kV'
+kV = kilovolt
+
 ###############################################################################
 # resistivity
 ###############################################################################

From 5f9554041e740c08cee2dd3ab17b0e5a31ceb9fd Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 14:31:27 +0200
Subject: [PATCH 04/27] add more common aliases

---
 scimath/units/energy.py | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/scimath/units/energy.py b/scimath/units/energy.py
index ac56167..c237563 100644
--- a/scimath/units/energy.py
+++ b/scimath/units/energy.py
@@ -12,7 +12,7 @@
 #
 
 from __future__ import absolute_import
-from .SI import joule, kilo, mega, giga
+from .SI import joule, kilo, mega, giga, tera, milli
 
 
 #
@@ -35,7 +35,7 @@
 
 calorie = 4.1858 * joule
 Calorie = 1000 * calorie
-kilowatt_hour = 3.6e6 * joule
+watt_hour = 3.6e3 * joule
 
 electron_volt = 1.60218e-19 * joule
 
@@ -43,8 +43,17 @@
 # aliases
 
 J = joule
-kJ = kilo * joule
-MJ = mega * joule
+millijoule = milli * joule
+kilojoule = kilo * joule
+megajoule = mega * joule
+gigajoule = giga * joule
+terajoule = tera * joule
+
+mJ = millijoule
+kJ = kilojoule
+MJ = megajoule
+GJ = gigajoule
+TJ = terajoule
 
 eV = electron_volt
 KeV = kilo * eV
@@ -52,7 +61,21 @@
 GeV = giga * eV
 
 cal = calorie
-kcal = kilo * calorie
+kilocalorie = kilo * calorie
+kcal = kilocalorie
+
+watt_second = joule
+kilowatt_hour = kilo * watt_hour
+megawatt_hour = mega * watt_hour
+gigawatt_hour = giga * watt_hour
+terawatt_hour = tera * watt_hour
+
+Ws = watt_second
+Wh = watt_hour
+kWh = kilowatt_hour
+MWh = megawatt_hour
+GWh = gigawatt_hour
+TWh = terawatt_hour
 
 
 # version

From 06e9af6a21df2bbecd0540d9e717a5a1fd19ea46 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 14:35:39 +0200
Subject: [PATCH 05/27] add some aliases

---
 scimath/units/force.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scimath/units/force.py b/scimath/units/force.py
index 2f3542e..de7ee71 100644
--- a/scimath/units/force.py
+++ b/scimath/units/force.py
@@ -13,9 +13,16 @@
 from __future__ import absolute_import
 from copy import copy
 
-from .SI import newton
+from .SI import newton, milli, kilo, mega
 
 N = newton
+millinewton = milli * newton
+kilonewton = kilo * newton
+meganewton = mega * newton
+
+mN = millinewton
+kN = kilonewton
+MN = meganewton
 
 lbf = 4.44822 * newton
 lbf.label = 'lbf'

From dfbaa081d00bf4de6fe9c18954c32635b83624fc Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 14:39:44 +0200
Subject: [PATCH 06/27] add some aliases

---
 scimath/units/frequency.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scimath/units/frequency.py b/scimath/units/frequency.py
index f59ae2b..029df5e 100644
--- a/scimath/units/frequency.py
+++ b/scimath/units/frequency.py
@@ -12,7 +12,7 @@
 # Date: 05/22/2005
 # Description: Define units of frequency
 #
-# Symbols defined: hz, khz
+# Symbols defined: hz, khz, kHz, MHz, GHz
 #
 #------------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@
 # Imports:
 #############################################################################
 from __future__ import absolute_import
-from .SI import hertz, kilo
+from .SI import hertz, kilo, mega, giga
 from .time import minute
 
 #############################################################################
@@ -30,6 +30,10 @@
 hertz.label = 'Hz'
 kilohertz = kilo * hertz
 kilohertz.label = 'kHz'
+megahertz = mega * hetz
+megahertz.label = 'MHz'
+gigahertz = giga * hertz
+gigahertz.label = 'GHz'
 
 rpm = 1 / minute
 rpm.label = 'rpm'
@@ -42,5 +46,8 @@
 hz = hertz
 Hz = hertz
 khz = kilohertz
+kHz = kilohertz
+MHz = megahertz
+GHz = gigahertz
 
 #### EOF ######################################################################

From 918d2832462ce8bab2c287368197135c30dfbe1b Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 14:43:32 +0200
Subject: [PATCH 07/27] add some aliases

---
 scimath/units/power.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scimath/units/power.py b/scimath/units/power.py
index 2759662..24e715e 100644
--- a/scimath/units/power.py
+++ b/scimath/units/power.py
@@ -20,10 +20,15 @@
 #     fourth edition, John Willey and Sons, 1993
 
 milliwatt = milli * watt
+milliwatt.label = 'mW'
 kilowatt = kilo * watt
+kilowatt.label = 'kW'
 megawatt = mega * watt
+megawatt.label = 'MW'
 gigawatt = giga * watt
+gigawatt.label = 'GW'
 terawatt = tera * watt
+terawatt.label = 'TW'
 horsepower = 745.7 * watt
 
 # aliases

From 1a8cefd13d3dd7bf2c4a1da46b6bf833583c1d73 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 14:49:44 +0200
Subject: [PATCH 08/27] add some aliases

---
 scimath/units/pressure.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/scimath/units/pressure.py b/scimath/units/pressure.py
index 5966d97..6c5bf8d 100644
--- a/scimath/units/pressure.py
+++ b/scimath/units/pressure.py
@@ -12,7 +12,7 @@
 #
 
 from __future__ import absolute_import
-from .SI import pascal, kilo, mega, giga
+from .SI import pascal, hecto, kilo, mega, giga
 from scimath.units.force import lbf
 from scimath.units.length import inch
 from scimath.units.unit import unit
@@ -29,21 +29,27 @@
 
 
 # aliases
-
+pascal.label = 'Pa'
 Pa = pascal
-Pa.label = 'Pa'
 
-kPa = kilo * pascal
-kPa.label = 'kPa'
+hectopascal = hecto * pascal
+hectopascal.label = 'hPa'
+hPa = hectopascal
+
+kilopascal = kilo * pascal
+kilopascal.label = 'kPa'
+kPa = kilopascal
 
-MPa = mega * pascal
-MPa.label = 'MPa'
+megapascal = mega * pascal
+megapascal.label = 'MPa'
+Mpa = megapascal
 mpa = MPa
 Mpa = MPa
 MPA = MPa
 
-GPa = giga * pascal
-GPa.label = 'GPa'
+gigapascal = giga * pascal
+gigapascal.label = 'GPa'
+GPa = gigapascal
 gpa = GPa
 Gpa = GPa
 GPA = GPa
@@ -61,10 +67,14 @@
 kbars = kbar
 
 millibar = 100 * pascal
+millibar.label = 'mbar'
+mbar = millibar
 
 torr = 133.3 * pascal
-atmosphere = 101325 * pascal
+torr.label = 'torr'
 
+atmosphere = 101325 * pascal
+atmosphere.label = 'atm'
 atm = atmosphere
 
 pounds_per_square_inch = lbf / inch ** 2

From 9dfae3f7cd57fc54da5505ed8f8d9006fb72acb3 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 14:53:06 +0200
Subject: [PATCH 09/27] added km/h

---
 scimath/units/speed.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scimath/units/speed.py b/scimath/units/speed.py
index 5acf9e3..7647501 100644
--- a/scimath/units/speed.py
+++ b/scimath/units/speed.py
@@ -47,6 +47,8 @@
 meters_per_millisecond.label = 'm/msec'
 kilometers_per_second = kilometer / second
 kilometers_per_second.label = 'km/s'
+kilometers_per_hour = kilometer / hour
+kilometers_per_hour.label = 'km/h'
 miles_per_hour = mile / hour
 miles_per_hour.label = 'mph'
 

From fe12ad1dee8e47262e317054184c545156e8323e Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 14:55:34 +0200
Subject: [PATCH 10/27] added some aliases

---
 scimath/units/area.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scimath/units/area.py b/scimath/units/area.py
index 40cee82..4940ef9 100644
--- a/scimath/units/area.py
+++ b/scimath/units/area.py
@@ -21,7 +21,9 @@
 #     fourth edition, John Willey and Sons, 1993
 
 square_meter = meter**2
+square_meter.label = 'm2'
 square_centimeter = centimeter**2
+square_centimeter.label = 'cm2'
 
 square_foot = foot**2
 square_inch = inch**2
@@ -36,6 +38,7 @@
 bn = barn
 barns = barn
 m2 = square_meter
+cm2 = square_centimeter
 
 # version
 __id__ = "$Id: area.py,v 1.1.1.1 2003/07/02 21:39:14 aivazis Exp $"

From 6a1657099d75327614fbcdfc44391760a9bd2738 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 15:06:34 +0200
Subject: [PATCH 11/27] added some aliases

---
 scimath/units/volume.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scimath/units/volume.py b/scimath/units/volume.py
index eb65013..f2d6695 100644
--- a/scimath/units/volume.py
+++ b/scimath/units/volume.py
@@ -73,13 +73,14 @@
 cm3 = cubic_centimeter
 cc = cm3
 
-m3 = V = cubic_meter
+m3 = cubic_meter
 
 f3 = cubic_foot
 ft3 = f3
 cuft = f3
 
 liters = liter
+l = liter
 
 bbl = barrel
 

From 29299ec56f61760f4124bb5b6ee976e02d2137bb Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 15:43:00 +0200
Subject: [PATCH 12/27] typo

---
 scimath/units/frequency.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scimath/units/frequency.py b/scimath/units/frequency.py
index 029df5e..d7beb25 100644
--- a/scimath/units/frequency.py
+++ b/scimath/units/frequency.py
@@ -30,7 +30,7 @@
 hertz.label = 'Hz'
 kilohertz = kilo * hertz
 kilohertz.label = 'kHz'
-megahertz = mega * hetz
+megahertz = mega * hertz
 megahertz.label = 'MHz'
 gigahertz = giga * hertz
 gigahertz.label = 'GHz'

From 8f776a34734d4283a59f41e449ace569e442905c Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 15:44:38 +0200
Subject: [PATCH 13/27] typo

---
 scimath/units/pressure.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scimath/units/pressure.py b/scimath/units/pressure.py
index 6c5bf8d..f92e1ae 100644
--- a/scimath/units/pressure.py
+++ b/scimath/units/pressure.py
@@ -42,7 +42,7 @@
 
 megapascal = mega * pascal
 megapascal.label = 'MPa'
-Mpa = megapascal
+MPa = megapascal
 mpa = MPa
 Mpa = MPa
 MPA = MPa

From 7d93df3019aca1d129b231ff6a66b4d597756184 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 15:46:39 +0200
Subject: [PATCH 14/27] typo

---
 scimath/units/geo_units.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scimath/units/geo_units.py b/scimath/units/geo_units.py
index cb7b722..256eb8c 100644
--- a/scimath/units/geo_units.py
+++ b/scimath/units/geo_units.py
@@ -5,7 +5,7 @@
 from scimath.units.dimensionless import fractional, fraction, frac, \
     percent, percentage, pct, parts_per_one, parts_per_million, ppm, ratio
 from scimath.units.electromagnetism import mho, millivolts, mmho, mSiemen, \
-    mS, mv, ohms, ohmm, ohm_m, ohm_meter, ohms_per_m, ohms_per_meter, \
+    mS, mV, ohms, ohmm, ohm_m, ohm_meter, ohms_per_m, ohms_per_meter, \
     siemen, siemens_per_meter, siemens_per_m, volts, v
 from scimath.units.force import lbf, lbs, N
 from scimath.units.length import foot, inch, m, meter, kilometers

From bc003d01491cfd3edc905237aed7f9a797b44ced Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 15:47:47 +0200
Subject: [PATCH 15/27] typo

---
 scimath/units/geo_units.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scimath/units/geo_units.py b/scimath/units/geo_units.py
index 256eb8c..dd0dc9c 100644
--- a/scimath/units/geo_units.py
+++ b/scimath/units/geo_units.py
@@ -6,7 +6,7 @@
     percent, percentage, pct, parts_per_one, parts_per_million, ppm, ratio
 from scimath.units.electromagnetism import mho, millivolts, mmho, mSiemen, \
     mS, mV, ohms, ohmm, ohm_m, ohm_meter, ohms_per_m, ohms_per_meter, \
-    siemen, siemens_per_meter, siemens_per_m, volts, v
+    siemen, siemens_per_meter, siemens_per_m, volts, V
 from scimath.units.force import lbf, lbs, N
 from scimath.units.length import foot, inch, m, meter, kilometers
 from scimath.units.mass import grams, lb

From d9439130cf570a6f3044b59f61c920660769344a Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 2 Jul 2019 16:31:01 +0200
Subject: [PATCH 16/27] add alias

---
 scimath/units/time.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scimath/units/time.py b/scimath/units/time.py
index 95d0abc..8697eee 100644
--- a/scimath/units/time.py
+++ b/scimath/units/time.py
@@ -77,6 +77,7 @@
 
 minutes = minute
 hours = hour
+h = hour
 days = day
 weeks = week
 years = year

From d2f0e838d2b79351000369d9af06ddaaaf4b2af6 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 23 Jul 2019 09:19:41 +0200
Subject: [PATCH 17/27] Update time.py

---
 scimath/units/time.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scimath/units/time.py b/scimath/units/time.py
index 8697eee..f50f1ae 100644
--- a/scimath/units/time.py
+++ b/scimath/units/time.py
@@ -79,6 +79,7 @@
 hours = hour
 h = hour
 days = day
+d = day
 weeks = week
 years = year
 

From edd0077258a4ffce0dfabc648aa8ec2777bc6ef8 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 23 Jul 2019 09:25:12 +0200
Subject: [PATCH 18/27] add rev

---
 scimath/units/angle.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scimath/units/angle.py b/scimath/units/angle.py
index 52f71c5..a1e7609 100644
--- a/scimath/units/angle.py
+++ b/scimath/units/angle.py
@@ -36,6 +36,7 @@
 
 radian.label = 'rad'
 radians = radian
+rad = radian
 
 grad = degree * 0.9
 grad.label = '^g'
@@ -56,6 +57,7 @@
 revolution = 360 * degree
 revolution.label = 'r'
 revolutions = revolution
+rev = revolution
 circle = revolution
 circles = circle
 turn = circle

From 84960a6f277613f2d0ccf99485c57115b1cf0750 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 23 Jul 2019 09:34:04 +0200
Subject: [PATCH 19/27] add angular speeds

---
 scimath/units/speed.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scimath/units/speed.py b/scimath/units/speed.py
index 7647501..1ab50bb 100644
--- a/scimath/units/speed.py
+++ b/scimath/units/speed.py
@@ -27,8 +27,9 @@
 #############################################################################
 
 from __future__ import absolute_import
-from .time import hour, second, millisecond
+from .time import hour, minute, second, millisecond
 from .length import foot, kilometer, meter, nautical_mile, mile
+from .angle import radian, revolution
 
 #############################################################################
 # Definitions:
@@ -52,6 +53,17 @@
 miles_per_hour = mile / hour
 miles_per_hour.label = 'mph'
 
+# angular speeds
+radiants_per_second = radiant / second
+radiants_per_second.label = 'rad/s'
+radiants_per_minute = radiant / minute
+radiants_per_minute.label = 'rad/min'
+revolutions_per_second = revolutions / second
+revolutions_per_second.label = 'rev/s'
+revolutions_per_minute = revolutions / minute
+revolutions_per_minute.label = 'rev/min'
+rpm = revolutions_per_minute
+
 #############################################################################
 # Aliases:
 #############################################################################

From c2e3d4d763e66dde2b09ec7bc61b35e72fd6a21a Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 23 Jul 2019 09:38:15 +0200
Subject: [PATCH 20/27] add C (coulomb)

---
 scimath/units/electromagnetism.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scimath/units/electromagnetism.py b/scimath/units/electromagnetism.py
index 1d394f3..727c193 100644
--- a/scimath/units/electromagnetism.py
+++ b/scimath/units/electromagnetism.py
@@ -4,6 +4,12 @@
 from scimath.units.SI import ampere, coulomb, farad, henry, joule, ohm, \
     meter, micro, milli, pico, siemens, tesla, volt, watt, weber, kilo
 
+###############################################################################
+# electric charge
+###############################################################################
+
+C = coulomb
+
 ###############################################################################
 # electric current
 ###############################################################################

From b9410ed66858a072fba40e67db26b046b366454c Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 23 Jul 2019 09:44:01 +0200
Subject: [PATCH 21/27] add some aliases

---
 scimath/units/electromagnetism.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/scimath/units/electromagnetism.py b/scimath/units/electromagnetism.py
index 727c193..a62d0ef 100644
--- a/scimath/units/electromagnetism.py
+++ b/scimath/units/electromagnetism.py
@@ -14,6 +14,7 @@
 # electric current
 ###############################################################################
 
+A = ampere
 amp = ampere
 amps = ampere
 amperes = ampere
@@ -46,6 +47,8 @@
 ###############################################################################
 
 ohms = ohm
+Ohm = ohm
+Ohms = ohms
 ohmm = ohm * meter
 ohmm.label = 'ohmm'
 ohm_m = ohmm
@@ -57,19 +60,22 @@
 # capacitance
 ###############################################################################
 
+F = farad
+
 micro_farad = micro * farad
-micro_farad.label = 'uf'
-mf = micro_farad
+micro_farad.label = 'uF'
+mF = micro_farad
 
 pico_farad = pico * farad
-pico_farad.label = 'pf'
-pf = pico_farad
+pico_farad.label = 'pF'
+pF = pico_farad
 
 ###############################################################################
 # conductivity
 ###############################################################################
 
 siemen = siemens
+S = siemens
 mSiemens = milli * siemens
 mSiemens.label = 'mS'
 mSiemen = mSiemens
@@ -90,15 +96,18 @@
 ###############################################################################
 
 henrys = henry
+H = henry
 
 ###############################################################################
 # Magnetic Flux
 ###############################################################################
 
 webers = weber
+Wb = weber
 
 ###############################################################################
 # Magnetic Field
 ###############################################################################
 
 teslas = tesla
+T = tesla

From 109c739046cabf3d5726c0e3e7f0c62bdf425c1f Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 23 Jul 2019 10:07:30 +0200
Subject: [PATCH 22/27] fix typo

---
 scimath/units/speed.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scimath/units/speed.py b/scimath/units/speed.py
index 1ab50bb..7a6417e 100644
--- a/scimath/units/speed.py
+++ b/scimath/units/speed.py
@@ -54,10 +54,10 @@
 miles_per_hour.label = 'mph'
 
 # angular speeds
-radiants_per_second = radiant / second
-radiants_per_second.label = 'rad/s'
-radiants_per_minute = radiant / minute
-radiants_per_minute.label = 'rad/min'
+radians_per_second = radian / second
+radians_per_second.label = 'rad/s'
+radians_per_minute = radian / minute
+radians_per_minute.label = 'rad/min'
 revolutions_per_second = revolutions / second
 revolutions_per_second.label = 'rev/s'
 revolutions_per_minute = revolutions / minute

From b2b695dba521014722f587d121db8a60a55f2f71 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 23 Jul 2019 10:10:37 +0200
Subject: [PATCH 23/27] fix typo

---
 scimath/units/speed.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scimath/units/speed.py b/scimath/units/speed.py
index 7a6417e..cae4352 100644
--- a/scimath/units/speed.py
+++ b/scimath/units/speed.py
@@ -58,9 +58,9 @@
 radians_per_second.label = 'rad/s'
 radians_per_minute = radian / minute
 radians_per_minute.label = 'rad/min'
-revolutions_per_second = revolutions / second
+revolutions_per_second = revolution / second
 revolutions_per_second.label = 'rev/s'
-revolutions_per_minute = revolutions / minute
+revolutions_per_minute = revolution / minute
 revolutions_per_minute.label = 'rev/min'
 rpm = revolutions_per_minute
 

From 80df12acb924d01a4235f548a5ec6bcd651aff4e Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 23 Jul 2019 13:56:28 +0200
Subject: [PATCH 24/27] add alias

---
 scimath/units/time.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scimath/units/time.py b/scimath/units/time.py
index f50f1ae..d2bd02a 100644
--- a/scimath/units/time.py
+++ b/scimath/units/time.py
@@ -76,6 +76,7 @@
 milliseconds = millisecond
 
 minutes = minute
+min = minute
 hours = hour
 h = hour
 days = day

From 9f6578604316a4b2ecc3b218dc65eb01e51fe8ce Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 23 Jul 2019 16:27:16 +0200
Subject: [PATCH 25/27] withdraw change v->V

---
 scimath/units/electromagnetism.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scimath/units/electromagnetism.py b/scimath/units/electromagnetism.py
index a62d0ef..5416ee5 100644
--- a/scimath/units/electromagnetism.py
+++ b/scimath/units/electromagnetism.py
@@ -30,17 +30,17 @@
 ###############################################################################
 
 volts = volt
-V = volt
+v = volt
 
 millivolt = milli * volt
-millivolt.label = 'mV'
+millivolt.label = 'mv'
 milli_volt = millivolt
-mV = millivolt
+mv = millivolt
 millivolts = millivolt
 
 kilovolt = kilo * volt
-kilovolt.label = 'kV'
-kV = kilovolt
+kilovolt.label = 'kv'
+kv = kilovolt
 
 ###############################################################################
 # resistivity

From f66f14e329636ea94c004a4f6ae1f900dc2654f1 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 23 Jul 2019 16:31:36 +0200
Subject: [PATCH 26/27] withdraw change v->V

---
 scimath/units/geo_units.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scimath/units/geo_units.py b/scimath/units/geo_units.py
index dd0dc9c..cb7b722 100644
--- a/scimath/units/geo_units.py
+++ b/scimath/units/geo_units.py
@@ -5,8 +5,8 @@
 from scimath.units.dimensionless import fractional, fraction, frac, \
     percent, percentage, pct, parts_per_one, parts_per_million, ppm, ratio
 from scimath.units.electromagnetism import mho, millivolts, mmho, mSiemen, \
-    mS, mV, ohms, ohmm, ohm_m, ohm_meter, ohms_per_m, ohms_per_meter, \
-    siemen, siemens_per_meter, siemens_per_m, volts, V
+    mS, mv, ohms, ohmm, ohm_m, ohm_meter, ohms_per_m, ohms_per_meter, \
+    siemen, siemens_per_meter, siemens_per_m, volts, v
 from scimath.units.force import lbf, lbs, N
 from scimath.units.length import foot, inch, m, meter, kilometers
 from scimath.units.mass import grams, lb

From 47bb97e7b751f3b904d85aa529222cc5dcd03074 Mon Sep 17 00:00:00 2001
From: 19leunam93 <39154009+19leunam93@users.noreply.github.com>
Date: Tue, 23 Jul 2019 16:41:21 +0200
Subject: [PATCH 27/27] adding some alias

---
 scimath/units/electromagnetism.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scimath/units/electromagnetism.py b/scimath/units/electromagnetism.py
index 5416ee5..72073e1 100644
--- a/scimath/units/electromagnetism.py
+++ b/scimath/units/electromagnetism.py
@@ -31,16 +31,19 @@
 
 volts = volt
 v = volt
+V = volt
 
 millivolt = milli * volt
 millivolt.label = 'mv'
 milli_volt = millivolt
 mv = millivolt
+mV = millivolt
 millivolts = millivolt
 
 kilovolt = kilo * volt
 kilovolt.label = 'kv'
 kv = kilovolt
+kV = kilovolt
 
 ###############################################################################
 # resistivity
@@ -63,11 +66,13 @@
 F = farad
 
 micro_farad = micro * farad
-micro_farad.label = 'uF'
+micro_farad.label = 'uf'
+mf = micro_farad
 mF = micro_farad
 
 pico_farad = pico * farad
-pico_farad.label = 'pF'
+pico_farad.label = 'pf'
+pf = pico_farad
 pF = pico_farad
 
 ###############################################################################