Merge pull request #7 from crayzeewulf/derived_units

Added derived units
Merge remote-tracking branch 'origin/master' into math_functions