updated submodule
updated setup.py
Merge pull request #77 from niyaton/fix-method-conflict

Fix method conflict