Restore  unit support. Fixes #28.