Merge pull request #70 from tclose/added_new_units

Added new units