Fixed the units problem (Issue #98)