[CLEANUP] Args not being passed through.
Merge pull request #120 from dcleao/master

[CLEANUP] Args not being passed through.