Simplify fetchEnumerator and enumerate API
Merge pull request #77 from bjankie1/develop

#74 Simplify fetchEnumerator and enumerate API