Improve argument parsing
Merge pull request #5 from mirego/feature/improved-argument-parsing

Improve argument parsing