merging CLI in marx branch, everything is working