Merge pull request #1 from Blodjer/hotfix

pull hotfix to master
update
Merge pull request #2 from Blodjer/master

izhivz