Merge pull request #2 from queckezz/fix/naming-collision

fix naming collision and change normal fn to generator fn
Release 0.0.1
really fix naming collision