closed #758
closed #915
Merge pull request #84 from yupe/master

UPD: merge with yupe/master