comitting to resolve issue 98 and 99
Merge pull request #101 from binbin4649/hotfixes

comitting to resolve issue 98 and 99