fixed new bugs
Merge pull request #26 from NHQ/master

fixed new bug