Merge pull request #24 from Itxaka/master

changed some args, could fix Issue #15
Merge pull request #25 from Itxaka/Stable

Merge pull request #24 from Itxaka/master