Broke up schedule
Merge branch 'master' into Igor
Completed control argument parser