reworked the cli / argument parsing, according to kuleszdl/SIFEI#57