Support for arguments stated in issue 46

Changes made in wrong branch