fix #1: Rework cli interface