Added properly support for arguments

I don't know if this is best practice, but it totally works!