Updated master.mak template
Updated run.py