support more unit types
Release 0.1.1