fix
Merge pull request #95 from yupe/master

UPD: merge with yupe/master