Fix arguments
Merge pull request #42 from toiee/fix-arguments

Fix arguments
Resolve conflict