I'm mad.
Merge branch 'master' into input_args
Removed excess comments