avoid method conflict
Merge pull request #10 from niyaton/fix-method-conflict

avoid method conflict
changed something