Merge pull request #261 from mystor/generic_arg_refactor

Generic arg refactor