Fixes #25; adds command line args to run.py