Merge pull request #1 from ikar2000/master

sync
bug fix
Merge pull request #1 from poluektik/master

bug fix