Added media option; Better command-line argument parsing
0.7.2