Committing to resolve issue 120
Merge pull request #122 from binbin4649/hotfixes_4th_sept

Committing to resolve issue 120