Use info from arguments instead of hardcoded
Use name and add documentation on its use
Merge pull request #13 from willemmulder/patch-1

Use info from arguments instead of hardcoded