Committing to resolve multiple issues.
Merge pull request #119 from binbin4649/hotfixes_3rd_sept

Committing to resolve multiple issues.