Merge pull request #7 from tsarzju/develop

fix bug
fix bug