Committing to resolve issue 98
Merge pull request #102 from binbin4649/hotfixes

Committing to resolve issue #99