Added properly support for arguments
Merge pull request #5 from oyvindrobertsen/arguments

Added proper support for arguments