changed some args, could fix Issue #15