Merge pull request #3 from hannorein/master

Major cleanup of run.py
Merge remote-tracking branch 'caden/master'