Refactor arguments
Merge pull request #67 from fluxroot/1.1.x-refactor-arguments

Refactor arguments