Added 'args' support.
Merge pull request #6 from Cybolic/args-fix-new-upstream

Added 'args' support.