Fix syntax error
Fix name error
Merge pull request #11 from bmng-dev/merge

Merge branch merge into Entrypoint