Proper argument parsing (closes #6)