Changes to support new arguments

NOT YET TESTING THOUGH
Smal fix in checkin out through git
Merge pull request #48 from soosterwaal/issue_39

Support for arguments stated in issue 46