Merge pull request #7 from crayzeewulf/derived_units

Added derived units