Merge branch 'issue/11' into 'master'

Issue #11: Fix command line arguments reading

See merge request !13
2 jobs for master in 1 minute and 2 seconds (queued for 1 second)