Proper handling of arguments
Merge pull request #3 from BIAINC/TD-8859

Proper handling of arguments