Merge pull request #24 from Itxaka/master

changed some args, could fix Issue #15