Feature/implemented proper arg parsing