Fill up StorageUnit and DisplayUnit definitions
Merge pull request #5 from hmin/update

Fill up StorageUnit and DisplayUnit definitions