#25 Basic support added
#25 Added support in CLI