Modify not to use eval()
Merge pull request #1 from robxu9/cli

Modify not to use eval()