Merging PR #139 Other units, beside '%' should also be kept