Fix command-line argument handling

Also 'export' is not needed here.
Merge pull request #1 from gelraen/patch-1

Fix command-line argument handling