Add cli support, 0.0.4