FIX: Fix unit passing
Merge pull request #131 from Eric89GXL/fix-units

FIX: Fix unit passing