fix errors
fix errors
fix errors
Merge pull request #105 from yupe/master

UPD: merge with yupe/master