Added zaki command and fixed encoding for command line interface
Merge