new version fixed bugs
Merge pull request #566 from ymatuhin/master

new version fixed bugs