Avoid method name collision
Merge pull request #114 from blase/avoid-method-name-collision

Avoid method name collision