Please pull the latest code

Hi @chrisshayan , please merge this pull request.

- Fix issues to prepare for deployment.