Fix #54
Refactoring initializing entry generators
Merge pull request #57 from teddychoi/master

Refactoring codes initializing entry generators